Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge v2.60.6 #116

Merged
merged 53 commits into from
Sep 4, 2024
Merged

Upstream merge v2.60.6 #116

merged 53 commits into from
Sep 4, 2024

Conversation

boyuan-chen
Copy link

@boyuan-chen boyuan-chen commented Sep 3, 2024

This updates our erigon to the latest upstream release.

yperbasis and others added 30 commits June 28, 2024 11:10
This is an additional check as erigontech#9990 could not be reliably reproduced.
The conjecture is that at some point there is a race condition somewhere
related to either storing snapshot file for an older block or updating
the DB for a more recent block.
Somewhere the code sets sender value directly to zero or overwrites a
pointer, leading to sender address being incorrectly assigned to ZERO.
…ch#10960)

fixes erigontech#9531

Changes:
- fixes a bug with the prestate tracer where we were incorrectly
subtracting the value of a transaction from the "to" address balance in
the "pre" state (should not be done for CREATE calls)
- fixes a bug with the prestate tracer where we were incorrectly adding
the value of a transaction to the "from" address balance in the "pre"
state (should not be done for CREATE calls)
- fixes a bug with the prestate tracer where we were incorrectly
decrementing the nonce value of a transaction's "from" address in the
"pre" state (should not be done for CREATE calls)
- adds a test generator that can generate the test files for us based on
real life transaction hash and node rpc url - check README
https://github.com/ledgerwatch/erigon/blob/fix-prestate-tracer-on-create-e2/eth/tracers/internal/tracetest/testgenerator/README.md
- adds test cases
- fixes some existing test cases that were setup with incorrect data
…ault true is preserved (erigontech#10986)

relates to erigontech#9784

- Adds support for an optional `"includePrecompiles"` tracer config
option for `callTracer` that users can use to control behaviour
(previous default of including precompile traces is preserved)
- Adds tests for default and for `"includePrecompiles": false` based on
https://etherscan.io/tx/0x536434786ace02697118c44abf2835f188bf79902807c61a523ca3a6200bc350
…rigontech#10979)

relates to erigontech#9784

- Adds support for an optional `"includePrecompiles"` tracer config
option for our OeTracer (OpenEthereum) that users can use to match
output of debug_* apis with callTracer (by default it includes
precompiles). Note default spec for OpenEthereum traces are to not
include precompiles - this is preserved by this PR
- Note geth has support for `"includePrecompiles"` so we are getting
more aligned as well -
https://github.com/ethereum/go-ethereum/blob/master/eth/tracers/native/call_flat.go#L124
- Adds tests for OeTracer
…1004)

made a mistake in previous PR
erigontech#10986
should always pop the precompiles stack for correctness
This add a Tip-Tracking test on Erigon v2 for Gnosis chain/network
…gontech#11078)

Cherry picks erigontech#11077

> A followup PR to erigontech#10119
which sets the fields `txpool.pricelimit`, `miner.gasprice` and
`gpo.ignoreprice` to 25gwei only for polygon amoy network.
> Upon sufficient announcements, it will be generalised to all polygon
chains later.
- added snapshot fill from DB state gathering
- refactor persisted data parsing
Add bailout mgt on evm.create() method (it is already mgt on evm.cal())
…11264)

accept in `genesis.json`:` "nonce": 0,`
now see: 
```
Fatal: invalid genesis file: json: cannot unmarshal number into Go struct field Genesis.alloc of type *math.HexOrDecimal64
```

See also `https://github.com/ethereum/go-ethereum/pull/26758`
…erigontech#11295)

Cherry-picked from erigontech#11294

> Remove the checks for amoy added previously to prepare for mainnet
release.
> Sets `txpool.pricelimit`, `miner.gasprice` and `gpo.ignoreprice` to
25gwei for all polygon based networks.
AskAlexSharov and others added 21 commits July 29, 2024 15:39
Merging diagnostics code updates from main branch.
Removed unnecessary struct type

Co-authored-by: Somnath <[email protected]>
- Updated gopsutil version as it has improvements in getting processes
and memory info.
…ch#11549) (erigontech#11551)

cherry-pick 2a98f6a for E2

relates to:
erigontech#10734
erigontech#11387

restart Erigon with `SAVE_HEAP_PROFILE = true` env variable wait until
we reach 45% or more alloc in stage_headers when "noProgressCounter >=
5" or "Rejected header marked as bad"
Changes:
- Collecting CPU and Memory usage info about all processes running on
the machine
- Running loop 5 times with 2 seconds delay and to calculate average
- Sort by CPU usage
- Write result to report file
- Display totals for CPU and Memory usage to processes table
- Display CPU usage by cores
- Print CPU details to table

Cherry pick from:
- erigontech#11516
- erigontech#11526
- erigontech#11537
- erigontech#11544
- added flags which was applied to run command to report
Copy link

@mmontour1306 mmontour1306 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this will break the current Hybrid Compute bundler (changes the StateDiff datatype from U256 to H256), so we should plan to update both services together on Sepolia.

Copy link

@jyellick jyellick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overally LGTM, one small request, could you please update the fork.yaml file to reference the current upstream commit?

@boyuan-chen
Copy link
Author

Overally LGTM, one small request, could you please update the fork.yaml file to reference the current upstream commit?

Yes, updated!

@boyuan-chen boyuan-chen merged commit cb4f95e into boba-develop Sep 4, 2024
18 checks passed
@boyuan-chen boyuan-chen deleted the release/v2.60.6 branch September 4, 2024 20:20
@boyuan-chen
Copy link
Author

boyuan-chen commented Sep 4, 2024

Note that this will break the current Hybrid Compute bundler (changes the StateDiff datatype from U256 to H256), so we should plan to update both services together on Sepolia.

I will do a new release deployment tomorrow. Could you please update the HC image?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.